Skip to content

OCPBUGS-82498: 4.21 rebase 4.6.10#371

Open
dusk125 wants to merge 102 commits intoopenshift:openshift-4.21from
dusk125:4.21-rebase-4.6.10
Open

OCPBUGS-82498: 4.21 rebase 4.6.10#371
dusk125 wants to merge 102 commits intoopenshift:openshift-4.21from
dusk125:4.21-rebase-4.6.10

Conversation

@dusk125
Copy link
Copy Markdown

@dusk125 dusk125 commented Apr 9, 2026

Go 1.25 reverts and conflict resolution handled by Claude

serathius and others added 30 commits September 23, 2025 17:47
…st negative revision

Signed-off-by: Marek Siarkowicz <siarkowicz@google.com>
…ry-pick-20693-to-release-3.6

[release-3.6] Reject watch request with -1 revision to prevent invalid resync behavior on uncompacted etcd and make rangeEvents safe against negative revision.
When EOF is encountered during TLS handshake, it is still logged as a
warning. This seems excessive and not really useful.

This patch ensures EOF is logged on debug only.

Signed-off-by: Ondra Kupka <okupka@redhat.com>
…ry-pick-20568-to-release-3.6

[release-3.6] server/embed: Log EOF on DEBUG in TLS handshake
Signed-off-by: Benjamin Wang <benjamin.ahrtr@gmail.com>
Signed-off-by: hwdef <hwdefcom@outlook.com>
Adds two test cases for the member promote operation when auth is
enabled. In the first case, the member promote request is submitted to
the leader, and in the second case it's submitted to the follower. The
leader case succeeds. In the other case, the follower forwards the
promote request to the leader. But, the forwarded request fails due to
a bug. The logs on the leader include this message:

```
failed to promote a member
```

as well as the error:

```
auth: user name is empty
```

Signed-off-by: xUser5000 <abdallahar1974@gmail.com>
When auth is enabled, sending a promotion request to a follower node was failing because
the auth token was not being propagated when the follower forwards the request to the leader.

Signed-off-by: xUser5000 <abdallahar1974@gmail.com>
Signed-off-by: xUser5000 <abdallahar1974@gmail.com>
Signed-off-by: xUser5000 <abdallahar1974@gmail.com>
…ry-pick-20792-to-release-3.6

[release-3.6] etcdserver: Fix: cannot promote member from follower when auth is enabled
…move learner issue

Signed-off-by: Benjamin Wang <benjamin.ahrtr@gmail.com>
Signed-off-by: Benjamin Wang <benjamin.ahrtr@gmail.com>
…ry-pick-20894-to-release-3.6

[release-3.6] Fix the issue that `--force-new-cluster` can't clean up learner after creating v2 snapshot
Signed-off-by: ronaldngounou <ronald.ngounou@yahoo.com>
…12410

[release-3.6] Bump from go1.24.9 to go1.24.10
…ry-pick-20887-to-release-3.6

[release-3.6] fix duplicate metrics collector registration attempted
Signed-off-by: Ivan Valdes <iv@a.ki>
Signed-off-by: Benjamin Wang <benjamin.ahrtr@gmail.com>
[release-3.6] Print token fingerprint instead of the original tokens in log messages
Signed-off-by: hwdef <hwdefcom@outlook.com>
Addresses CVE-2025-47914, CVE-2025-58181.

Signed-off-by: Ivan Valdes <ivan@vald.es>
[release-3.6] dependency: Bump golang.org/x/crypto from 0.36.0 to 0.45.0
Signed-off-by: joshjms <joshjms1607@gmail.com>
Running genproto fails with:

% (cd tools/mod && 'go' 'install' 'golang.org/x/tools/cmd/goimports')
stderr: /home/prow/go/pkg/mod/golang.org/x/tools@v0.38.0/cmd/goimports/goimports.go:23:2: missing go.sum entry for module providing package golang.org/x/telemetry/counter (imported by golang.org/x/tools/cmd/goimports); to add:
stderr: go get golang.org/x/tools/cmd/goimports@v0.38.0
FAIL: (code:1):
  % (cd tools/mod && 'go' 'install' 'golang.org/x/tools/cmd/goimports')
Failed to install tool 'golang.org/x/tools/cmd/goimports'

Signed-off-by: Ivan Valdes <ivan@vald.es>
@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 9, 2026
dusk125 added 4 commits April 9, 2026 16:01
…/20260327_dep"

This reverts commit e841e10, made with merge commit strategy.
…c/release-3.6-go-1.25.8"

This reverts commit a402fbe, made with merge commit strategy.
…aha30/fix-cve-GO-2026-4559-3.6"

This reverts commit 3dd99be, made with merge commit strategy.
…1026/bump-3.6-to-gov1.25.7"

This reverts commit 7116d86, made with merge commit strategy.
@tjungblu
Copy link
Copy Markdown

/lgtm
/label backport-risk-assessed

/retest-required

@openshift-ci openshift-ci Bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Apr 10, 2026
@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Apr 10, 2026
@dusk125
Copy link
Copy Markdown
Author

dusk125 commented Apr 13, 2026

/retest-required

@openshift-ci openshift-ci Bot removed the lgtm Indicates that a PR is ready to be merged. label Apr 13, 2026
@dusk125
Copy link
Copy Markdown
Author

dusk125 commented Apr 14, 2026

/retest-required

@tjungblu
Copy link
Copy Markdown

/lgtm

/label backport-risk-assessed

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Apr 23, 2026
@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented Apr 23, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dusk125, tjungblu

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@dusk125
Copy link
Copy Markdown
Author

dusk125 commented Apr 23, 2026

/verified by ci

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Apr 23, 2026
@openshift-ci-robot
Copy link
Copy Markdown

@dusk125: This PR has been marked as verified by ci.

Details

In response to this:

/verified by ci

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@dusk125 dusk125 closed this Apr 28, 2026
@dusk125 dusk125 deleted the 4.21-rebase-4.6.10 branch April 28, 2026 13:33
@openshift-ci-robot
Copy link
Copy Markdown

@dusk125: This pull request references Jira Issue OCPBUGS-82498. The bug has been updated to no longer refer to the pull request using the external bug tracker. All external bug links have been closed. The bug has been moved to the NEW state.

Details

In response to this:

Go 1.25 reverts and conflict resolution handled by Claude

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@dusk125 dusk125 restored the 4.21-rebase-4.6.10 branch April 28, 2026 13:53
@dusk125 dusk125 reopened this Apr 28, 2026
@openshift-ci-robot
Copy link
Copy Markdown

@dusk125: This pull request references Jira Issue OCPBUGS-82498, which is invalid:

  • expected dependent Jira Issue OCPBUGS-82497 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is POST instead
  • expected dependent Jira Issue OCPBUGS-82497 to target a version in 4.22.0, but it targets "4.22" instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

Go 1.25 reverts and conflict resolution handled by Claude

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@dusk125
Copy link
Copy Markdown
Author

dusk125 commented Apr 28, 2026

/jira refresh

@openshift-ci-robot
Copy link
Copy Markdown

@dusk125: This pull request references Jira Issue OCPBUGS-82498, which is invalid:

  • expected dependent Jira Issue OCPBUGS-82497 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is POST instead
  • expected dependent Jira Issue OCPBUGS-82497 to target a version in 4.22.0, but it targets "4.22" instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

Details

In response to this:

/jira refresh

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@dusk125
Copy link
Copy Markdown
Author

dusk125 commented Apr 28, 2026

/jira refresh

@openshift-ci-robot
Copy link
Copy Markdown

@dusk125: This pull request references Jira Issue OCPBUGS-82498, which is invalid:

  • expected dependent Jira Issue OCPBUGS-82497 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is POST instead
  • expected dependent Jira Issue OCPBUGS-82497 to target a version in 4.22.0, but it targets "4.22.z" instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

Details

In response to this:

/jira refresh

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented Apr 28, 2026

@dusk125: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/unit a991227 link true /test unit
ci/prow/upstream-integration a991227 link false /test upstream-integration
ci/prow/upstream-e2e a991227 link false /test upstream-e2e

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Development

Successfully merging this pull request may close these issues.